From ad093a82a5afc2bc09423a946a29db35d817bd2c Mon Sep 17 00:00:00 2001 From: Camm Maguire Date: Wed, 18 Dec 2019 20:14:09 +0000 Subject: [PATCH] Version_2_6_13pre77 Gbp-Pq: Name Version_2_6_13pre77 --- h/elf32_arm_reloc.h | 6 ++---- h/elf32_armhf_reloc.h | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/h/elf32_arm_reloc.h b/h/elf32_arm_reloc.h index abeeac9c..bad940fd 100644 --- a/h/elf32_arm_reloc.h +++ b/h/elf32_arm_reloc.h @@ -18,10 +18,10 @@ case R_ARM_JUMP24: { long x=((long)(s+a-p))/4; - if (abs(x)&(~MASK(23))) {/*24?*/ + if (abs(x)&(~MASK(24))) { got+=(sym->st_size-1)*tz; memcpy(got,tramp,sizeof(tramp)); - /*relocate*/ + /*recurse on relocate?*/ got[sizeof(tramp)/sizeof(*got)]=s; x=((long)got-p)/4; } @@ -29,8 +29,6 @@ } break; case R_ARM_V4BX: - add_vals(where,~0L,s+a); - break; case R_ARM_ABS32: add_vals(where,~0L,s+a); break; diff --git a/h/elf32_armhf_reloc.h b/h/elf32_armhf_reloc.h index 2f316651..9b375378 100644 --- a/h/elf32_armhf_reloc.h +++ b/h/elf32_armhf_reloc.h @@ -4,7 +4,7 @@ case R_ARM_THM_JUMP24: { long x=(long)(s+a-p); - if (1||abs(x)&(~MASK(25))) { + if (abs(x)&(~MASK(24))) { got+=(sym->st_size-1)*tz; memcpy(got,tramp,sizeof(tramp)); @@ -32,7 +32,7 @@ case R_ARM_THM_CALL: { long x=(long)(s+a-p); - if (1||abs(x)&(~MASK(23))) {/*24?*/ + if (abs(x)&(~MASK(23))) { got+=(sym->st_size-1)*tz; memcpy(got,tramp,sizeof(tramp)); -- 2.30.2